Status update:

• This PR now consumes bitkit-core 0.3.9.
• Local verification passed on c0274e311: just compile, just test, and just lint.
• There are no unresolved review threads currently open.
• Coordination note: feat: bump core to 0.3.9 and hw reliability #1062 touches much of the same Core/HW wallet surface. I’d recommend keeping this PR as the base for the Core hardware-activity refactor, then rebasing or splitting feat: bump core to 0.3.9 and hw reliability #1062 afterward so the hardware reliability fixes stay separately reviewable.

Status update after HW journey validation:

• The core unblock is resolved for this branch: it consumes bitkit-core 0.3.9 and the Android artifact from the publish task.
• I re-ran the Bridge Trezor emulator flows on 8372a730f: connect-home-tile.xml, activity-blue-icons.xml, activity-detail-hw-tags.xml, and detail-overview.xml.
• Validation passed for the important HW activity/wallet paths: deterministic Trezor pair/fund, blue Core-backed activity rows, All Activity tabs, persisted hwtest tag, tag filter, Explore txid/input/output data, hardware wallet detail, transfer amount screen after the first-run intro, remove cancel, final remove, watcher stop, and hardware activity purge.
• The app log confirms cleanup after removal: Deleted '1' activities for hardware wallet ....
• I also updated the HW transfer journey specs so fresh emulator runs handle the first-run Transfer To Spending intro before asserting HardwareTransferAmount; otherwise the journey can false-fail before reaching the amount screen.
• No fatal/crash signatures showed up in logcat. Existing local checks remain: just compile, just test, and just lint passed on c0274e311; xmllint passed for the updated HW journey XMLs on 8372a730f.

Remaining handoff: wait for checks/reviews on 8372a730f. If those settle cleanly, this should be ready to move out of draft/request review. #1062 overlaps with this work and should likely be rebased or split after this lands, but treat that as coordination guidance rather than a blocker for this branch.

Trezor Android: #1044 vs #1062 — QA findings

Date: 2026-07-06
Tested: refactor/core-hww-activities-1029 (#1044) on physical device (to.bitkit.dev)
Comparison: feat/wallet-scoped-core-0.3.9 (#1062) shows correct Trezor balance on same device

Scope mismatch

• feat: bump core to 0.3.9 and hw reliability #1062 — 2.4.0 / Hardware wallet connection reliability and UX polish #1030: minimal Trezor v1 (pair, balance, transfer-to-spending, BLE reconnect). HW balance/activities from watcher in memory. No tags, Explore I/O, Boost, unified Activity tab integration.
• refactor: use core hw activities #1044 — 2.5.0 / Bitkit Core support for hardware wallet activities #1029: full Core-backed HW activities (tags, Explore inputs/outputs, Boost, wallet-scoped persist, unified activity list). QA checklist explicitly covers tags + Explore.

#1044 may be a stretch for 2.4.0: iOS Trezor is still behind, and for cross-platform consistency we should not ship HW tags or Explore inputs/outputs in 2.4.0. That fits 2.5.0 / #1029 instead.

Finding 1: Trezor shows 0 balance + empty activity list (#1044)

Symptom: Paired Trezor with known funds/history → app shows 0 sats and no activities.

Not a Trezor/connect issue. Watcher starts; Core emits data; UI never updates.

Cause: In HwWalletRepo.observeWatcherEvents(), persistHardwareActivities() runs before _watcherData is updated. On failure it return@collect — balance and activities never reach UI.

Log evidence (bitkit_2026-07-06_08-34-36.log):
bitkit_logs_2026-07-06_08-50-23.zip

Started watcher 'ble:5B:B1:C8:E9:4C:BE|nativeSegwit'
ERROR Failed to persist hardware activities
  AppError='Failed to upsert onchain_activity: UNIQUE constraint failed: onchain_activity.id'
hardwareWallets=[{"id":"ble:5B:B1:C8:E9:4C:BE","sats":0}]

Likely persist root cause: HW activity ids = txids. Error on onchain_activity.id suggests stale pre-0.3.9 schema (id globally unique) or failed migration — collides when same tx exists on Bitkit wallet and Trezor (e.g. transfer between wallets). Fresh install / clear app data should confirm.

#1062: Updates _watcherData from watcher first; does not gate UI on persist. Works on same device.

Finding 2: Transfer shows duplicate rows — Transfer + Sent (#1044)

On transfer to spending, activity list shows two rows for one flow:

• Transfer (Bitkit wallet)
• Sent (Trezor / HW wallet)

Both appear in unified list; both are taggable. Not a quick polish issue — needs product rules for cross-wallet dedup/linking (transfer_tx_id, filtering, etc.). #1044 merges dupes across address-type watchers, not Bitkit↔Trezor transfer pairs.

Finding 3: Scope ahead of 2.4.0 (#1044)

#1044 adds:

• Tag support on HW activities
• Explore inputs/outputs
• Boost with wallet-scoped Core lookup
• HW activities in global Activity tab (filters, tags, blue icons)

Reasonable for 2.5.0 / #1029, but not aligned with a minimal, iOS-consistent 2.4.0 Trezor release.

Prod / migration concern

Not a prod issue today — no Trezor in prod.

Before HW launch (2.5.0): migration must work on upgrade; UI must not depend on persist succeeding; transfer dedup needs design.

Clear app data is a dev QA workaround, not a ship strategy.

Recommendation

Later: cherry-pick #1062 reliability commits onto #1044 for 2.5.0; don’t merge as competing 0.3.9 paths.

#1044 fixes needed (2.5.0, not blocking v1)

1. Decouple UI from persist — update watcher state even if Core persist fails; log error separately.
2. Fix persist failure — ensure 0.3.9 (wallet_id, id) migration on upgrade; handle shared txids across wallets.
3. Transfer dedup UX — one logical row per transfer, not Transfer + Sent both taggable.
4. Continue Bitkit Core support for hardware wallet activities #1029 scope (tags, Explore, Boost) only after above is stable.

Links

• feat: bump core to 0.3.9 and hw reliability #1062
• refactor: use core hw activities #1044

Decouple UI from persist — update watcher state even if Core persist fails; log error separately.

Addressed this Android-side gating issue: watcher state now updates before Core persistence, so the Trezor balance/activity UI stays live even if a Core upsert fails. Persistence failures are still logged with the watcher id, and received-transaction emission remains behind successful persistence.

Validation: just compile, just test, just lint.

The migration/collision and transfer dedup points remain broader draft follow-ups outside this scoped fix.

Resolved in f546f58

Set milestone to 2.5.0 for clarity 👍🏻 , thanks for review & checks @piotr-iohk 🙏🏻

Trezor shows 0 balance + empty activity list

Transfer shows duplicate rows - Transfer + Sent

Scope ahead of 2.4.0

The branch is now rebased on the merged #1062 and latest master, and consumes bitkit-core 0.4.0. The old pre-release database state from this report is no longer the branch/base under review. Wallet-scoped persistence is the source of truth, and watcher state is published only after the matching activities and transaction details are available for list/detail navigation.

I reran the full Bridge flow on the current head with two independently funded and mined hardware receives. Both appeared once with the correct wallet scope, and list tabs, tags, tag filtering, Activity Detail, and Explore all used the persisted entries.

Transfer-to-spending now reconciles the watcher-created sent activity with the transfer metadata. The Bridge run showed one pending Transfer / From Savings row, then the same row confirmed after mining while Spending increased by the transferred amount. Device removal purged that wallet's activities, and re-pairing rebuilt its confirmed history.

This work remains scoped to 2.5.0 / #1029. just compile, just test, and just lint all pass on the current head.

Resolved in 5ae816a